From: M A Young <m.a.young@durham.ac.uk>
Date: Sun, 7 Sep 2014 19:10:33 +0000 (+0100)
Subject: tools/ocaml: remove uint32 use
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4465
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ddfb12eed686148fc50bbf58e992dc2d2c627b22;p=xen.git

tools/ocaml: remove uint32 use

OCaml is replacing its own uint32 type with the ISO C99 uint32_t type
in 4.03.0+dev. Ths patch replaces the remaining uses of uint32 with
uint32_t in the ocaml C code for xen.

Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
Acked-by: David Scott <dave.scott@citrix.com>
---

diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c
index 8bd1047490..17656c27b1 100644
--- a/tools/ocaml/libs/xb/xs_ring_stubs.c
+++ b/tools/ocaml/libs/xb/xs_ring_stubs.c
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <xenctrl.h>
 #include <xen/io/xs_wire.h>
@@ -42,8 +43,8 @@ static int xs_ring_read(struct mmap_interface *interface,
 	XENSTORE_RING_IDX cons, prod; /* offsets only */
 	int to_read;
 
-	cons = *(volatile uint32*)&intf->req_cons;
-	prod = *(volatile uint32*)&intf->req_prod;
+	cons = *(volatile uint32_t*)&intf->req_cons;
+	prod = *(volatile uint32_t*)&intf->req_prod;
 	xen_mb();
 
 	if ((prod - cons) > XENSTORE_RING_SIZE)
@@ -72,8 +73,8 @@ static int xs_ring_write(struct mmap_interface *interface,
 	XENSTORE_RING_IDX cons, prod;
 	int can_write;
 
-	cons = *(volatile uint32*)&intf->rsp_cons;
-	prod = *(volatile uint32*)&intf->rsp_prod;
+	cons = *(volatile uint32_t*)&intf->rsp_cons;
+	prod = *(volatile uint32_t*)&intf->rsp_prod;
 	xen_mb();
 	if ( (prod - cons) >= XENSTORE_RING_SIZE )
 		return 0;